Changed a little bit the logic in RPS things