Merging back William's changes.