I'll just leave my existing macros as they are.

However, future macros will take advantage of @