Merging in Raquel's code.