- bring back a mistakenly deleted method
- use proper references for our data model