giorgio's changes