Converting control to master class control