A bit more sophistication around focus in and out