More focus behaviour tweaking.