Integrate notifications into bypass
Fix unbound variable