Refactoried ...