improved subscription system