More work on the focus system