Merge new code