Refactoring v2 :(