Added check for can join