Added Gabby's changes.