Even more simplification