A little faster, plus some more research