revised WP1 from Nicola