redid changes that got overwitten in merge