Use new behavior macro