changed for custom server