Refactorv2