Sandro's changes

Sandro's changes