added additional geometry inputs