Added if statement for no measurements