Update to Cilantro preview 3