Updating with new images an suggestions from Bruno.