Annotated source for 0.4.1