overhauled for more efficient uwi list