Unified Payment code

for activities and freestyle