moved model around, better naming