replace _now to make_timestamp