Changes to callers, way data scaling handled in Cutter