Refactor notification to get rid of multiple requests