VOYEUR: Further saving logic