Improved the control mechanism