small changes before merge