Added focus controls