update for Marionette 2. update methods, refactor code