Further refactoring...
Further refactoring...