Adding Kristin's code