Updated for latest version of Machina