updated according to last meeting