Added notification handler
fixed conflicts