Memory leak fixed 95% done