Updated Controls Logic