Removed individual measure functions and used a loop to generate them instead