corrected geom.cpp again