Copied changes proposed from Manuela Grindei.