Updates for marionette and editing/adding