Added more of Noa's comments