Working right
Cleaning leaks