more of the rw graph regex changes