[WILL REBASE] change for new identification of list