Some untested improvements