Updated with Katerina's Code