Fix subscription
push for merge with jorgie
Add checf subscription