Changed Controller to Server