Allow joining (33/36)

Allow joining