chg updater, add guard macro