Merging in the old project