before merge
Changes