moved to annotations (optimized the reader)
adjusted the rest of the classes for annotaions