debut refactor map