[MOD] refactored