Some modifications to smoothing/prediction