reorged wlst stuff