Final commit with changes