Works, and made it substantially faster too.