WIP:play support simple refactor