sync changes in macro 1 & 2