Jarv/updates for stage rds