add focus with bug need to be fixed