added notifications. Didn't test yet