r1455 + more RSU code