modified models and controller with new functionality