Added more geometric stuff