found a way to make it simpler still.....