changed things that got replace from last merge