merging chwink_controller