let me fix these in Models