Merge with Abby's version.