Refactoring
Minimum noise
found a better native solution
taking @ibash advise
1.4.0