prepare for v3.5