improved rr-plugin