Some changes to address Fabrizio's comments