Update focus, add notifications