Reworking model some more.