moved notification messages closer to the source