changes from pr