added jawbone, moves notification handler