Redo image-selection criteria
Stop using this unnecessarily