RR: update functionality, closes #586