change code so it fits new measurements