refactored
master data list refactored