replace _next with force
add macros