Roberto's changes