Updates to collinear code base.