Beta version 1
concurrentmodificationexception fix