irrelevant stuff
merging
fix update membership bug