Merge missing code