Focus management improved