Final commit with all changes