More work on env_prod