Focus management improved 2