Fixed updates to joining

Fixed updates to joining