Speeding it up a bit would be nice too.