Re #21: add comments