Changes to speed things up.