freshly handle the proper way in Models