refactor to use get_singular_node in two grooms