MOVED: Help needed merging code