The unified version with the latest modifications made by both CV and CP