Slight changes for joining