Updated images from aaron's branch.