Fixing ConcurrentModificationExceptions and MemoryLeak present
Merged conflicts
More conflicts