Some changes
Work in progress, modeling explained