quick changes before merge