Update to 2.0 r4