Minimal changes on standar, student and teacher controller.