Speeding things up drastically (Still pretty slow, though)