Modified some measurements