leaks fix + design