Updated ws_fnc