First draft with Martin's comments entered.