improved & annotated