minor changes from Milan