Starting Dan's battle tweaks