Update utility, geometry from develop.