Oops update (and clean up)