-changed geometry names to geom
-added synchronous return of geometry and value