[wip] IT's refactore