Upgrade to Marionette 2