Merge with the original code