First attempt to refactor processing order and handling notification