name changing
refactored
Fixing merge