Factor r (23/31)

Factor r