- Added some more presumptive stuff.