Make it work with multiple images
resolve conflicts