Made some changes to controllers user interaction