update according reviewer comments