Updated macro for efficiencies.