Removal of all bv1. Re-named battle_value vars to battle_value2 for clarity.