i think i made a mess in Models