Minor changes to w2