Final commit before pushing to public