updated according to last stefan's commit