Updated macro section.