added every macro