add focus, testing smart-collections
Merge branch 'smart'