added several more combinations of geometry sources