Simplified things a bit