+ minor changes missed when rewriting