JC: updated version.