Added spotting capability