Added Samantha's code