#190 - updates from review