#147 - update from review