Minor Changes

The code now runs again when the teacher portions are removed.

We might have broken it.