Checked in Todd's changes