This should speed things up a bit.