RPS feature was added, minor improvements