added a comment
merged with Sam's branch