Lots of updates for mk2