added DRLs
refactored code
minor refactor