change to use subject code insted of subject name