Added new user-control system