further refinement of model structure for speed improvements.