More annotated source code