updated few things for subscribing