Better AS notification handling …