#342 - updates from review