Path refactored and geometry errors fixed