minor changes before merge