About to fix the memory issues