Better focus (16/21)

Better focus