M6 demo'd, merge with master