modifications by WP2