- Added back Jesica's missing changes during merge.