Added ability to handle shopped-up geometry