Fixing all the mess