Simplified things greatly