Modified GeomSolverv2.java