Changes from Friday; working on dummy vars