applied Sanders max_and_focus.patch