comment util and logic
change clause from List to Set