udpated files with new controller and other stuff