replacing subscribers to students; bug fixes
merge conflict resolved