Allow joining (22/36)

Allow joining