Add two new images, optimize some others