Merge and add some code