Updated macro