added some more changes to the make subscribers
merged