S-01005: Return MedSup
- code refactoring
- minor updates