some overall simplification ...