small changes for subscription