updated subscription and payment process
merge with phase2 branch