Improve RPS