69338442: improved macro functions