Changed over single to composite for HJ.