refactored models
zjebane