Changed fucntions in Controller to be upper case