small changes for subscribing