Finished the environment-variable level approach