Modifications needed to use big_vertices. Minor fix