reverted model to prior formulation. No indices now.