Mix the environments up a bit better