Cherry pick of Elena's repo

This merge includes a cherry pick of a Elena's most recent commit, which includes only cleanup and the addition of new images. By utilizing this cherry pick we should exclude any more fundamental changes that could break the code.