rework of w3 and w5