Macros for v5

This is for PROS btw