Updated macro-add