WWorking on controller