Final changes with new images