Added geometry and math