untested changes to be amended