modifying the server to support latest changes