Focus listener improved 2