update for v3.6