Update giving images
Merge changes