modify for WB