Fabrizio's changes