Tried to merge Vito's and my changes