Added notification system that works on both sides