[UPDATE] refactoring