:+1: This is a cleaner solution. @rndm2 Do you want to make this change?