Added Jack's changes.