Added Jeanette's code