Issue #3: Fix Out of Memory Errors