REFACTORING 270314