modified models and controllers