Editted some of the controllers