updated geometry class