A better version, perhaps