Need to Handle Memory Leak