Major update to the controller states handling.