Refactored again
Merge with fixit