Andrea's additions.