W to Wi Conversion and Update

W to Wi Conversion and Update