Fixing the mess