updates for focus mode abstraction