Changes made with Emanuele.