Removed testing old code that has confused Dani. Sorry!