Mk2 changes based on documentation.

Untested (obviously).