change in subscription logic, need to change it more!!!