more work on macro support