Initial MCJoin code change