[WIP] refactoring dream subscriber