update rework and error handling