[add] continue reworking