Added correct status handling to update