#257 - updates from review