Revert "Change to pupil list"

This reverts commit d68bca33906e64f47ebd6f19050cb8f03a22b3ae.