updated modelcontroller