changing domain calculations to be on geom