slight simplification