Updated annotated sources