updated Linda's changes