Change timing and messages for WHM macros