Updated measure code. Still too many parse results