Updated dimension changes
Merged conflicts on master branch