Here’s something that will be much nicer