[TEMP] refactor