Faster

Faster, but breaks with some large files?