Changes for not removing the images and return noImage image in the case it does not find images for it
Conflicts resolved