Final commit and changes