Fixing magicfind - need to rewrite it to be less hacky
Fixing magicfind - need to rewrite it to be less hacky