working on subscription logic