Changed way images are gathered