Eliminated most of the leaks