Prepare for -pr.8