Added back Olga's changes