removed ToneType, pleaced all refs with MachineType