Further work on macro