more disentangling of WFS objects