Fixed Controller for new input