modified bq_bat and constants