added sth to the server part from msm