spf: added results. refactored to remove duplication
Merge branch 'spf' into toaster