add notice2
marge from zap 6/7