Changed the environment a bit, according to changes we decided on