Merge streamlined code