updated according to review