Second Commit

Modeling optimized.