New images and changes from @mizarf