modifications after 1st merge