add list info and reorganize more