Add Joe's changes

Merge joes changes in environment to github