Simplified things a bit...