Better battle set up