Allow joining (17/36)

Allow joining