Work fine, refactoring in works