Simplified things quite a bit.