still fighting mem leaks