Updates for image and few modification