Added David's changes.