notification added, refactoring in-progress