Added Martina's code