update hannes's draft