redone WP1-4