reworked controller