more work on the custom server