More R4 updates