Old config and comment, waiting for update from Andy.