tried to add in more list support