More work on auto-fighting