Updated ENv. Model
Merge branch 'master' of https://github.com/DaNiwa/comp361