Updated to use the latest from Lattice.