basic geometric functions
removed geometry macro