Added Sheila's changes