changed to DRY layout
Merge branch 'modeling-issues'