separated some stuff and the notifications are better now