merged w/ the code I worked on with Aaron