Improve Chiop Control and Finish