Reworked the image gathering mechanism (see #1)