New: enhancedfunctionality