removing momentum and introducing better controls