Allow joining (28/36)

Allow joining