initial focus mode fix - WIP