Factor r (24/31)

Factor r