final update (I hope)