This is much nicer than the old code :+1: