add matric no and remove magic strings and number