A much, much better solution