Simplified things more