Added Danny's changes.