lots of updates to the measureing