Fixing Leaks Final