just small syntaxic changes