Final commit. All changes finished up