Update for env ease of initial set-up