Made images more optional
Fixed merge