Update MAC to draft 05

Closes #194