oops i made a mess in Models