merged wp-2 wp1-3