[FIX]: replace local macros with code