Added Harry Lawrence's changes