added acceleration and velocity scaling