more changes to control class