Adjustment for server environment
test