Added clean points - still buggy