more untested changes