Changes to RPS/Kind graphing