updated for server deployment