Refactored Solution
Trying to fix Merge issue