mods to support marionette 2.0
mods to support marionette 2.0