/rejoin didn't work - this commit will be sqashed, just so you can see the changes