changes in subscribe code