updated for dev servers