refactoring of gamemaster and updaters done