Final changes before merge