updates to w2r1 (complete)