some changes for RD
conflict resolved