updated according to 2nd review