(COMMIT-11) Modified controller