Lots of images and code modifications