Initial merge with Lorenzo's draft.