changes for lists
merge conflicts resolved