Modified server startup code