updated according to issues