Local variables instead of global. Extended find procedures.