Fixing converted stupid things
Completed convert