Updated saga finder

Redid the handler...