fixing subscribe and adding keys