more fix to the spotlight stuff