Re-added geometry functions