Revamped state updating r4