Memory Leak reduced