data now updated to reflect proper groupings and rations