Fixed to add w/wout total, fixed with new apca
Fixed handling of totals in function to call APCA