Final Changes

*All changes made