changes to rrserver