Added join and leave