Modified Eddie to be 2nd Degree
Merge branch 'develop'