Use AddOn variable instead of broadcasts