Make function simpler, semi-fix focus