merge
cleaned up, added notification channel send