Added Bill/Teresa's changes.