rework of controller