In progresses refactoring...