Final commit with code