7382: more abstraction
7382.1