additional changes from matthew