final update (i hope)