WPHRT-58 changes