refactoring and being of sync