A better version

Reviewed with @albertodebortoli