Final commit before merge