MOD: refactoring based on user system