concurrentHashmap, and comment changes