Refactoring Stage 2
Fixed Annotation back bug