Added focus functionality