Revamped state updating r6