removed marionette and added replacement controller