Revert "this code makes more sense imo"
Revert "this code makes more sense imo"

This reverts commit bbf58114408dc5d9c6c0e2a92b7464cfdb7d2353.

ZeusWPI/FK-enrolment,ZeusWPI/FK-enrolment,ZeusWPI/FK-enrolment