Added focus also