Integrating Andrea's Changes