Final RPS commit