Included Martina's code