updates from Nicola P