added adriennes list
fixing merge conflicts