updating to handle multiple suffixes