merging in the old one