some code for rejoiing issue, still not done