moved some measurements