tweaking data models and controllers