Updated for new machine.