#2 Refactoring x3