added spotlight changes
merge conflict