few changes to student context