Updating with errors, hopefully final