move macros to v10