Trying to Revamp the controls