macros update for Nicolas