Improve logic
Coalesce the mods and stu counts