annotations on proper lines. remove concurrentmodification problem in registry