Updated UMC with Geometry