with @bbest, removing redundant and debug code in MAR