update from review comments