Think I've finished conversion to new mix items