modifying the server to support latest changes pt 2