More general scanning for PeaceOfMind