work on model
when conflicted: drop these changes