Latest refactoring
Latest refactoring