Some Controller Changes