updated geometry builder

see comments/email