Make function simpler, semi-fix focus
Fix typo
manual merge