A better solution