Add changes to Teacher. CR: GA