merging Andrea's changes