some more simplification