Completed P-1.17 + P-1.18.