additional untested changes