merged wp1-1