Made a few changes to be sure that keyan can use the new program to measure