Learned a new trick, much cleaner