A few changes in Controllers