Speed up fitting slightly