modify for a server usage