2 Commits (refactoreds2)