Merged in Beau comments