Add Geoff's comment on 11/24

And also all the content are synced with master now