Refactoring OK
Neutral base ON-GOING