changes to models and controllers