W & F added