My Fixes
Merge