small changes in analysing macros