Updated to latest change in teacher's repo