Latet Refactoring Changes