Merge the new code