Updated/Hopefully completed environment