Untested changes

Need to test this, but not on this workstation.