Refactor
Fixes
Merge