changed subscribe form a bit