refactored, extras module