Merge Wallace Changes