Safety save... Still need to fix the state header totals