changed to single controller