Merge with production code