changes from p[r feedback