replace outdated macro with the 2 updated ones