Refactored Affilate