more work on server related code