Some changes made in measures class for more reasonable code.