Macros updated for 4.0!