Rework RPS specs