More WSIT code