bring reina's changes in #20

Closed nbx0 closed 1 year ago