Updated to generate only consolidated points