Minimal changes for GR8Conf US