Changes made before merge