Model Setup reworked again!