Model Update

Updated Scaling for more realistic model.
Reorganized grouping.