merge some to make easier diff