Final commit with comments