added more options for measurements