further untested improvements