jf: update to MK2