bsm d3 server side
second merge