Updated annotated source code