Jacopo's updates