more work on controller