Modifications made fro testing Andrew's new merging