chnages including handling when there is no images