Primary care providers (PCP's) will be randomized to intervention and control arms. Their T2D patients will be identified by searching computerized pharmacy records for OHA or insulin, followed until they are on a stable medical regimen, and eligible to participate if their baseline HbA1c is 7.0 - 9.5% if on OHA or 7.5 - 10.0% if on insulin. Two sample frames will be created for intervention patients: one of patients on OHA alone and one of patients on insulin alone or in combination with OHA. The same procedure will be used to develop corresponding sample frames for control patients. OHA patients will be randomly sampled from the intervention and control groups at a ratio of 1:1 until 174 subjects have been enrolled. Insulin patients will be recruited in the same manner until another 174 subjects are recruited. At entry, patients will have measurements of fat mass, insulin-resistance, stimulated C-peptide, carbohydrate intake, and physical activity level.