Simplified things
more simplification