improved WFS