Rebuild to get the nested list working