New sample delegate
Handle focus a little better (but not much)