WSOTWO-142: Updated