final update, hopefully