rev 50 : Out of Memory Crash fix && Support for older APIs