A little less inefficient