refactoring Changes