Updates for rs code