Merge over from original