even more simplification