Second commit. Redid the controls