bug fix, implement subscribers