Second commit. Modified controller files