Adjustments to speed things up