TOOK OUT THE CONDITIONS IN macro creation