added smaster
student changes...
student.....