updated for server run