experimental macros now have full functionality of the older version
- the old one should be replaced;

todo: negotiation finished notification broken (possibly still in 'lite' branch);