removed the option part and kept the env vars