update to use lists