fixing things before merge