Fixes
Fragmented code