missed some SCALE_FACTOR substitutions