edited to for movefocus changes